Auto merge of #1680 - steveklabnik:gh1679, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 3 Jun 2015 15:29:16 +0000 (15:29 +0000)
committerbors <bors@rust-lang.org>
Wed, 3 Jun 2015 15:29:16 +0000 (15:29 +0000)
commit73bca79ef5e5bd02959a81d732a56d17be60f06d
treea5f0e3aaf49e8ced49a58c1263127493874e83fe
parent69c2af26cfac655d3358d8de6c85e1d0c6b7fbb6
parent305f7444d0eba98aa322f9ea8cb74172e211acdd
Auto merge of #1680 - steveklabnik:gh1679, r=alexcrichton

Fixes #1679